new killer feature
Merge pull request #2 from frankrousseau/master

New killer feature + blabla