Add composer.json by #3
Merge remote-tracking branch 'origin/master' into development
Fix missing argument count #6