Refactoring
Merge pull request #63 from cfiken/fix

Refactoring