Minor updates
Merge branch 'master' of https://github.com/sebastiandammark/basic

Conflicts:
	README.md