Optimization, Swag optimization.
Merge pull request #1 from Tbaile/patch-1

Optimization, Swag optimization.