Fixes #19

Issue: #19