R1:d9df307c6955

Merge pull request #19 from toulouse/master

Oh god how did this get here i am not good with computer