Fix leaks
Merge branch 'fix/leaks' into dev
Merge branch 'dev' of https://github.com/olegb94/TechServer into dev