Merge pull request #5 from mcrocks999/master

Fixed Issue #2 and #4
Merge pull request #1 from JavaText/master

Merging latest commit