Merge pull request #83 from RaulBer/master

Issue #70