minor preparations
Merge branch 'master' of https://github.com/ndrew/monte