Merge branch 'wip' of https://github.com/zahidnadeem/darussalam into wip