Refactor-1. Fix #26
Merge pull request #28 from darkowlzz/refactor1

Refactor-1. Fix #26