Merge pull request #72 from i-MSCP/hotfixes