Removed hardcoded style used for testing
Merge branch 'develop'
Changed version number
Merge branch 'develop'