Bug fix 2540
Merge branch 'master' of https://github.com/bvds/LaitsV3