Merge pull request #44 from jcarlosgarcia/master

Manually merged