style and extend
Merge pull request #1 from bigethan/master

style and extend