Issues Fixes Imported

Imported the Fixes for

https://github.com/Rythal/Carbonite/issues/36
https://github.com/Rythal/Carbonite/issues/37

Thanks to Alex for the fixes
I've only imported them