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

hi
Merge pull request #86 from sjw787/sjw787stage5

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