Merge branch 'master' into test2

Conflicts:
	README.md
Merge pull request #6 from ianmoeller/test2

Merge branch 'test2' into master