Improvements to handling of titles
Merge branch 'master' of file:///N:/documents/repos/ttt/nimrodel