Changes
Merge pull request #1 from madtrick/master

Changes