[Shameless US]
Merge pull request #142 from michalbe/master

[Shameless US]