add support for new highwire format
fix detect path per @aurimasv 's suggestions
Merge pull request #621 from adam3smith/highwire

add support for new highwire format