Merge pull request #33 from RaulBer/master

Issue #1