Minor changes
Merge pull request #35 from hithwen/master

Minor changes