Refactoring so that there are no more known memory leaks#30

gitu wants to merge 3 commits intoPuloV:masterPuloV/ics-golang:masterfrom

gitu:mastergitu/ics-golang:masterCopy head branch name to clipboard