New options for further customisation

Improved version of #9