add Log class, fix bugs
Merge commit '75b72675ac021831d70d032fc4fd280f6619fb20' into vani's_branch
Merged