Merge branch 'release/0.1.1'
update readme
Merge branch 'release/0.1.2'
add calculator function called calc
Merge branch 'master' into develop
Merge branch 'master' into develop