Did a little redesigning.
Merge pull request #1 from Artemish/master

Changed a few things, if you want to keep the changes add it.