Added more tests
Modified resolve to handle nil values better
Added expand context options
Fixed clone() and converted line endings
Fixed line endings
More tests
Multiple bugfixes. All expansion tests should pass.