#5 fix issue 3 and 4

Merged
sharky555 merged 2 commits from issue3and4 into master 3 years ago

2 Commits