bug fixes
...
Merge branch 'master' of https://github.com/akleroy/cpropstoo