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

hi