Merge pull request #28 from Codeinwp/production

sync
Merge pull request #29 from Codeinwp/development

Merge pull request #28 from Codeinwp/production