hacked away the nasty nil bug
bumped version
Merge branch 'release/0.4.18'
Merge tag 'v0.4.18' into develop

hackish bugfixing