Merge pull request #104 from RaulBer/master

Issue #84