Stage 6 improved
Merge pull request #206 from UAhmad7/master

Stage 6 improved
Merge pull request #207 from SUNY-Albany-CCI-INF362/master

Stage 6 improved