Merge pull request #2 from inkrement/dev

refactored