ColorFactory to fix #48 

Fixes #48

Moves color construction into the ColorFactory.