Merge pull request #1 from Quinten/gh-pages

test to merge gh-pages in master
Updated readme
Merge pull request #2 from Quinten/master

merge master into gh-pages