Fixes #57 & #56