fixes #2
Merge remote-tracking branch 'origin/master' into fix-something

Conflicts:
	README.md
Merge pull request #6 from chesleybrown/fix-something

fixes #2