Merge branch 'romanze' into 'master'


Resolves #5