updates from production use
Merge branch 'master' of https://github.com/texuf/pymonster