Add temporary hacks. Must fix tests
Release candidate v0.0.15-rc1