fixes #17 & #18