refactored
Merge pull request #132 from liuggio/ddd

refactored