Fixes #9 and closes #19