some modifies
Merge branch 'orm' of github.com:vsg68/cupv into orm
Merge branch 'orm' of github.com:vsg68/cupv into orm
Merge branch 'orm' of github.com:vsg68/cupv into orm
Merge branch 'orm' of github.com:vsg68/cupv into orm
Merge branch 'orm' of github.com:vsg68/cupv into orm
Merge branch 'orm' of github.com:vsg68/cupv into orm
Merge branch 'orm' of github.com:vsg68/cupv into orm
Merge branch 'orm' of github.com:vsg68/cupv into orm
Merge branch 'orm' of github.com:vsg68/cupv into orm
Merge branch 'orm' of github.com:vsg68/cupv into orm
Merge branch 'orm' of github.com:vsg68/cupv into orm
Merge branch 'orm' of github.com:vsg68/cupv into orm
Some justice