Modified parsing of structured data
Merge branch 'master' of https://github.com/stucco/rt