Remove DataStorage
Merge branch 'hotfix/20140122-issue-95' / close #95