small
changes
Merge branch 'master' of https://github.com/tchronis/pmem

Conflicts:
	pmem.m
Merge branch 'master' of https://github.com/tchronis/pmem

Conflicts:
	pmem.m
Merge branch 'master' of https://github.com/tchronis/pmem

Conflicts:
	pmem.m