Added color-shorthand option

#32