GoNawazGo: Some fixes + improvements
Merge branch 'master' of https://github.com/ahmedbhaila/GoNawazGo