fixs
Merge pull request #179 from SUNY-Albany-CCI-INF362/new2

fixs