release candidate for v2.2
reworked a check for being inside the par space

to account for rounding errors
Merge branch 'master' into develop
Merge branch 'fix_issue_2' into develop