Merge pull request #28 from CruGlobal/dev

better caption handling
Merge pull request #29 from CruGlobal/dev

Dev