Further updates from Timo
Merge branch 'master' of https://github.com/erichare/pelica