Merge pull request #12 from ifandelse/master

Adding fromFile to module export (and tests), whitespace/formatting update to current esformatter settings