Merge branch 'release/v0.3.2' into develop
Merge branch 'master' of github.com:ptdavteam/bridle into develop
Merge branch 'hotfix/v0.3.3' into develop
fixes
fixed some tests
version bump
fix conflicts
fix conflicts