Merge pull request #30 from Garonenur/dw

refactor and rename