almost working
Merge pull request #38 from dlopezh/master

almost working