Fixes issue #45
Merge branch 'master' into build
buil build buil build build booom