Carry over from master repo - 7/30/2014
Fix for repeat order error
Versioning