Minor refactoring
Merge pull request #9 from wcandillon/0.2.1

Minor refactoring