fixed init events (new object for each instance)
Merge branch 'master' into ui