fixed merge in orderparameter.py
Merge pull request #21 from jhprinz/master

fixed merge in orderparameter.py