fixed MIT-7
fixed more for mit-7
Merge pull request #7 from baodemo/mit-7

Mit 7. done