Merge pull request #37 from Gonthim/master

Refactoring Work