Merge pull request #35 from prakhar1989/master

new colors! :neckbeard:
Comments and tests