set memory_limit as -1
Merge branch 'issue-71' into develop