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