Closes #146 - It includes all the new features included in Wesby 0.1.0-M4
Pass all tests, closes #145
Merge branch 'hotfix-5' into develop