Made Changes Mr Steinborn suggested

Some Changes Mr Steinborn suggested
Merge pull request #55 from SUNY-Albany-CCI-INF362/master

Made Changes Mr Steinborn suggested