Merge pull request #36 from mmmaisel/dev