Add custom parsing similar to my/state/our
Merge branch 'custom-parsing'

* custom-parsing:
  Add custom parsing similar to my/state/our