Minor changes
Merge pull request #199 from UAhmad7/master

Minor changes
Merge pull request #200 from SUNY-Albany-CCI-INF362/master

Minor changes