Merge pull request #407 from drewnoakes/spanify-makernotes

Spanify top-level parsing for makernotes

Author: drewnoakes