ticket by chirag
Merge branch 'master' of https://github.com/dixanta/kgarira