Fix #40
Merge pull request #41 from magistere/fix40

Fix #40