Merge pull request #4 from nursit/refactoring