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

pull master to hud