Merge pull request #41 from jbaruch/master

next dev version