release v1.0
release version 1.1
fixing 1.1
Merge branch 'fixes' into develop