fixes
Merge pull request #180 from SUNY-Albany-CCI-INF362/setlement-conf-fix

fixes