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

update branch
Merge pull request #283 from SUNY-Albany-CCI-INF362/justin

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