cleaned argumentCtrl and removed locator
modified defaultCtrl to be able to handle arguments
Merge remote-tracking branch 'origin/master'