Workaround versioning problems
Merge branch 'release/0.0.5'