Refactor.
Merge pull request #9 from pazur/patch-2

Refactor.