Merge pull request #124 from Chunjie/master

file storage layer implementation