Add commands for working with memory
Merge branch 'master' into memory

Conflicts:
	main.c