[#16] No more memory leaks