Resolved merge
Merge branch 'master' of https://github.com/Gemabit/vhost-manager.git
Resolved merge