Merge pull request #40 from sebastianCain/master

wtf