Refactoring
Merge pull request #4 from urakey/develop

Refactoring