Fix #15
Fix #15
Merge pull request #17 from ecomfe/fix-15

Fix 15