Possible to add optional parameters
Merge branch 'development' of https://github.com/oSoc13/tdt-UI into development