merge changes from jugglingdb
bump version