refactored some code and made it more DRY
Updated stylus
Merge pull request #6 from declandewet/develop

Develop