Fixed minor issues
Merge pull request #108 from UAhmad7/master

Fixed minor issues
Merge pull request #109 from SUNY-Albany-CCI-INF362/master

Fixed minor issues