Use gusset color table instead of in place implementation
Fix typo
Merge branch 'feature/CI-106' into develop

Conflicts:
	setup.py