Merge branch 'release/0.1.0' into develop
setup_tools doesn't like markdown
Merged and modified setup.py