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:
I am incrementing always by one (at the end of the loop) so doing += 2 would result in jumping ahead 3 chars.