Issue 69
Merge pull request #70 from aranzuglia/master

Changes to solve issue #69