somechanges
Merge pull request #1 from infiniteLaziness/master

somechanges