style changes
set up for development
Merge branch 'develop'