refactors code
Merge pull request #21 from trizko/master

refactors code