Actually make entire function attach to window
Merge branch 'master' of ../stage