version bump to 1.0-SNAPSHOT5
and some minor bug fixes

#35