Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
update version on setup.py
Merge branch 'master' into develop