Merge branch 'master' of https://github.com/poschi3/opacclient (Pull request #136)