Minor changes
Merge pull request #5 from carsmie/master

Minor changes