Merge pull request #19 from alexisabril/master

Issue 18