Merge for Ketty
Merge pull request #85 from WannabeSid/master

Update for ketty