Merge pull request #105 from RaulBer/master

Issue #84