Updated versions and various bug fixes
Preparing a release
Prepare new release