Merge pull request #24 from ddunker/master

refactoring