Cleanup

Added some of dratr fixes: https://github.com/dratr/Carbonite
Merge pull request #108 from nelegalno/N2C10

N2C10