Version 0.10.0
Update to conform 0.6.0
Merge develop
Add support for 0.14.2-dev