Minor fixes and improvements
Merge pull request #2 from BlazeTide/master

Minor fixes and improvements