Refactoring Work
Merge pull request #17 from Gonthim/master

Refactoring Work
update accord with last re-factoring.