Fixing: memstream crash
Merge pull request #1 from brkakkaya/dev

Fixing: memstream crash