Refactor
Merge pull request #13 from rkophs/refactor

Refactor