Fixed Issue #2
Fixed Issue #4
Merge pull request #5 from mcrocks999/master

Fixed Issue #2 and #4