Merge pull request #210 from kiranhugo/master

Added Order suspension and fixed some issues
.
Merge remote-tracking branch 'upstream/master'