Recovering changes from #48
Merge pull request #9 from itexico/48

Recovering changes from #48