Fixes #11 & #12