Fixes #91 & #79