Fixes a slight bug with options and updates the readme
Deleted old readme
Merge branch 'master' into gh-pages