anger management
Merge pull request #51 from michalbe/master

update