Removed trailing spaces
Added support for numeric, better error messages.
Merge pull request #1308 from cameroncf/orm-work

dbutil work