Changes to limit the possiblity of memory leaks
Bump version