Fix async handling of multiple files
Merge remote-tracking branch 'upstream/master' into file-support

Conflicts:
	package.json
Merge pull request #10 from gonsfx/file-support

Fix async handling of multiple files