fix some bugs
Merge branch 'master' of https://github.com/karllrak/EatAnywhere
I need merge!