minor fixes
Merge branch 'dev'
bumped version to 1.1.1
Merge branch 'master' into dev