Merge
Merge pull request #1 from monkog/master

Merge