Merge patch from @e1himself. Closes #17.