Refactored
Merge pull request #2 from nurupo/master

Refactored a little