Small changes in code.
Bumped version number to 0.3.1
Small but fixes and changes to README.md
Merge branch 'hotfix-0.3.1'