fix
Merge branch '0.5' of https://github.com/morpheyesh/megam_gateway into 0.5