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

update branch