Fix parsing errors that prevent install
Merge pull request #2 from galthaus/pull-req-master-bcbecabbc2

Merge essex-hack back into development. [3/26]