Fixes #17 & #20