storage
optimizing model n controller
Merge pull request #4 from allucardevil/master

special handling