Jo's last change
Merge pull request #37 from confpub/master

last change