Updated
Merge pull request #143 from SUNY-Albany-CCI-INF362/changes-7

Updated