Merge pull request #219 from RaulBer/master

Issue #191