added a namespace reference to handle out of order loading
Merge branch 'master' into component-controller