Rest of stuff for Ketty
Merge pull request #212 from WannabeSid/master

Rest of stuff for Ketty