Merge branch 'develop' into feature/FLEx_Support
Adds parseFLEx function. Untested
Adds flex to supported input formats
Merge branch 'feature/FLEx_Support' into develop