Merge branch 'wp/refactoring/18'
Merge pull request #20 from yashunsky/master

Merge branch 'wp/refactoring/18'