Refactoring.
Merge pull request #3 from shamsan/develop

Refactoring.