fix issue #13
Merge branch 'staging' of https://github.com/dohaibac/Tre_mo_coi into staging