fixed function calls more
Merge branch 'master' of https://github.com/lyeechong/my-simple