bugfixes
prepare for release
prepare for release