Merge pull request #133 from adrianp/poo

comments: fixes