Merge pull request #202 from UAhmad7/master

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

Merge pull request #202 from UAhmad7/master