Merge branch 'release/0.2.5' into develop
* Updated name in setup file
Merge branch 'release/0.2.6'