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

update mybranch
Merge pull request #136 from SUNY-Albany-CCI-INF362/mybranch

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