Refactor Macroed class
Merge pull request #12 from golyshevd/refactor

Refactor Macroed class