Fixing multi-file run errors for issues #11
Merge branch 'master' into package