Update version for development 0.1.1
Update constant naming to prevent conflicts
Updates for release v0.2.0