Merge pull request #51 from asika32764/hotfix

Hotfix 20140116 for controller
Fixed #49