added onLoad event
Merge branch 'master' into wellcome