pic, bug fixes
Merge pull request #8 from SUNY-Albany-CCI/master

pic, bug fixes