Merge pull request #184 from SUNY-Albany-CCI-INF362/master

update this branch