saving +-2MB here
Merge pull request #45 from cpasmoi/master

saving +-2MB here