Merge pull request #23 from deviprsd21/master

Flexibility In-Built