Merge branch 'release/0.2.5' into develop

* release/0.2.5:
  Minor fixes
Minor improvements to the README
Bump the version number
Merge branch 'release/0.2.6'

* release/0.2.6:
  Bump the version number
  Minor improvements to the README
Merge branch 'master' into gh-pages

* master:
  Bump the version number
  Minor improvements to the README