refactor
Merge pull request #7 from haazime/solid

refactor