Fixes [#19]
Note