Fix issue#37: disconnect between interface and implementation method signatures
Merge remote-tracking branch 'upstream/master'
Fixing the controller generation script