Merge pull request #26 from kbsali/memory_limit

Memory limit
Update composer.json
Merge remote-tracking branch 'origin2/master' into default_database