some last minute bugs
bumped version
snapshot
Merge branch 'master' into devel