Fixed #496
Merge branch 'master' of github.com:CERN/apvs