update modulecontroller with the master branch