Merge pull request #15 from zelgerj/master

refactoring