Fixed another nullpointer
Bump version
Updated binaries
Merge branch 'dev'