Upgrade parsing logic to 1.7

Closes #10