Merge pull request #1 from adamgotterer/master

Misc bugs fixes and improvements. v1.0.07
Fixed grammar