encarsia Merge pull request #4 from encarsia/dev …