Fixes #5 & #6