Code review on #12

See commit messages for detailed informations on what changed.

Needless to say tests are still running properly (thanks for providing tests!). :smile:
Oops, didn't thought of this, lets revert these lines.