Merge pull request #15 from rustyswayne/master

Patched order creation
Cleanup