Merge pull request #30 from dalers/master

initial merge of ordermgmt branch from Mark Gajudo