Minor changes
Merge pull request #53 from xyproto/master

Minor changes