Fixes #17 (an issue with lunch coloring)
Merge branch 'dev' into gh-pages