Fixed shipment order locking issue
Merge pull request #27 from ionux/master

Fixed shipment order locking issue