Merge origin/master into gh-pages

Conflicts:
	README.md
Merge pull request #18 from RandomCodeFG/master

Merge origin/master into gh-pages