everything
Merge pull request #1 from Misko-2083/master

everything