no.
Fixed almost everything... yeah.
Merge pull request #32 from WClement/master

wooo