Merge branch 'release/v0.1.4' into develop
Update README.rst
Made the code less WET to fix #2 and added the logic to fix #1
removed comments as they are messy
bumped version
Merge branch 'release/v0.1.5'