Merge pull request #48 from gentnerlab/dev

big release
Merge pull request #49 from gentnerlab/master

Merge pull request #48 from gentnerlab/dev