Fixed #395 and fixed #396
Merge branch 'master' of github.com:CERN/apvs
Fixed #395 and fixed #396