made controller constructors
Merge branch 'master' into controller