Added proper size and color logic
Merge pull request #167 from uptownjimmy/ColorAndSizeLogic

Added proper size and color logic