Merge pull request #652 from u451f/master

Mousetrap license is Apache2.0