Fixed small bugs from the merge
Merge pull request #38 from pmlrsg/dev

Fixed small bugs from the merge