Version bumped from  0.2.4 to 0.2.5
Better documentation
Merge branch 'hotfix-0.2.5'