almost working...
Merge pull request #30 from WClement/master

almost working...