Merge https://github.com/yashunsky/wand into wp/refactoring/14
Merge pull request #16 from yashunsky/wp/refactoring/14

Wp/refactoring/14