added optional captions
Merge branch 'master' of https://github.com/alexiswolfish/Flex