Closes bugherd/122
Merge branch 'master' of https://github.com/PerceptumNL/KhanLatest