fixed bug
Merge branch 'master' of https://github.com/killmaster/On-the-way