Kill code mort!!
Merge pull request #60 from Makabey/Eric20140711_01

Kill code mort!!