Merge pull request #2 from ismailsunni/ismail_fixes

Ismail fixes
Merge remote-tracking branch 'kartoza/master' into ismail_fixes