Closes #6 and #18
Merge remote-tracking branch 'origin/hotfix/clean-and-update'

Conflicts:
	.gitignore
	README.md
	package.json