model & storage function finished
Merge pull request #269 from leoliang/master

model & storage function finished