First commit
commit #52
hotfix update
Merge branch 'iss53' and 'hotfix'

Conflicts:
	README.md