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

Conflicts:
	README.md
Merge commit 'e787487680b47a61beff2d7bab52ac3aa80670e0'