Merge branch 'hotfix/20140203'
Change Input/OutputStorage -> Input/Output
Merge branch 'hotfix/1391389738-issue-8' into develop