Merge pull request #1 from grez72/master

forking it
more pulls
Merge pull request #1 from harvard-visionlab/master

right back at you grez72