Merge branch 'hotfix/20140127'
Restruct class
Merge branch 'hotfix/20140203' into develop