Added basic comments and EventManager.
Added basic comments and EventManager.
Merge origin/master