1.18b fix
Added some fixes
Merge branch 'fix' into dev

Conflicts:
	README.md