commit 2.1
commit 2.2
Merge pull request #3 from maanenh2/bugFix2

Bug fix2