new controller
Merge pull request #1 from lhk/master

new controller