update
Merge pull request #143 from michalbe/master

[Shameless US]