Merge pull request #11 from GantMan/master

Few little touchups