fixed all bugs i think
Merge branch 'master' of https://github.com/bkeyoumarsi/imo