Tweaks from tom
Merge pull request #6 from ltg-uic/master

Tweaks from tom