Merge pull request #141 from inthepoche/dev

beta3
Fix #149
Merge branch 'dev' of https://github.com/nicofrand/poche into dev