Merge pull request #3 from mogohax/master

PSR-2 coding style and coffeescript