Fixes #253 & #252
Merge pull request #254 from Adam8234/fixes

Fixes #253 & #252