Merge pull request #132 from adrianp/poo

pybabel fixes