initial commit
1.0 released
Merge branch 'develop'