Refactored article
Merge pull request #256 from eugenst/refactor_article

Refactored article