Memory leaks removed
Merge pull request #52 from bavc/0.6

Memory leaks removed