added support for 0.6.5+
Merge branch 'devel'
removed some errored (not test fails) tests
version bumped to 0.2.1