Added caption support
Merge branch 'Captions'
Updated version