Merge pull request #48 from gentnerlab/dev

big release