Merge pull request #119 from RaulBer/master

Issue #98