Add support for new flex syntax
Revert padding changes
Merge pull request #3 from walmartlabs/flex-support

Add support for new flex syntax