few bug fixes, I'll be cleaner with commits soon!
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md