Merge pull request #4 from Coms362/master

Merge pull request #9 from rdincher/master