Fix #29
Merge pull request #30 from eduardolundgren/master

Fix #29