Implemented inputmanager
Merge origin/master