Memory management
Merge remote-tracking branch 'origin/master'

Conflicts:
	pom.xml
Merge pull request #5 from logachn/master

Memory management