Merge pull request #8 from WeaveTeam/develop