Merge pull request #88 from jcarlosgarcia/master

Fixes #85