Refactoring Work
Merge pull request #38 from Gonthim/master

Refactoring Work