__version__ = '0.2'

merge changes from 'develop'
This will then be release 0.2