Merge pull request #31 from paulosborne/0.3.4

0.3.4
Update README.md
Merge remote-tracking branch 'origin' into 0.3.4

Conflicts:
	README.md