Split parseScript into two methods.
parseFile now returns the correct value.
Version bump.

Updated CHANGELOG.
Merge branch 'edge'