Merge pull request #24 from Gonthim/master

Refactoring Work. Depend on pull-shared.0.2-SNAPSHOT