Merge pull request #7 from RubyLouvre/master

merge from master
model ==> data
Merge pull request #56 from ilife5/master

model ==> data