Merge pull request #9 from nderambure/master

Some cleanup