Merge pull request #473 from fjullien/memusage