added a comment to controller
merge master and test