whot Merge pull request #2 from hadess/master