Fixes #143 and #147

Don't know what to do with the conditional yet. Looked for `loadFile` and `load` as suggested in #143 but didn't find those methods/functions in a quick search of the repo on Github. Will look into it in a bit.