Fix some bugs
Fixed bugs #42 #41 #35
Merge pull request #51 from asika32764/hotfix

Hotfix 20140116 for controller