Bug
Merge pull request #3 from rhattersley/bug

Bug
Merge remote branch 'origin/v0.1.x' into bug

Conflicts:
	README.md
Merge pull request #4 from rhattersley/bug

Port bug fix to 0.2