Internal killer feature
Merge pull request #31 from isfit/killer_feature

kvitter: self_awesoming