v0.1
Merge remote-tracking branch 'jtrans/master'

Conflicts:
	README.md