1.0.0.4
Merge branch 'master' into HotFix

Conflicts:
	README.md
1.0.0.5
1.0.0.6
Merge pull request #1 from joefeser/HotFix

Hot fix