CHG: Applying best practices.
CHG: Applying best practices.
Merge pull request #6 from damianpv/feature-changes

Feature changes