Bug fixes
Merge branch '0.0.6' into completion

Conflicts:
	Readme.md