This commit fixes #19

This commit will close #19