Merge pull request #9 from niksu/master

refactored;
* Refactored