Merge pull request #134 from adrianp/poo

fixes