Merge pull request #305 from jerv13/master

Fix use statements. Rename controller
Merge remote-tracking branch 'upstream/master'