Minor changes
Merge pull request #36 from charosez/master

Minor changes