Improving caption feature. See description

Fixes #39
Fixes #40