major bug fix in CompleteCondition class
Merge branch 'master'