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