Update to new Swift syntax
Merge branch 'develop' into feature/mogenerator
Add mogenerator