some more design changes
Merge pull request #3 from pixeldesu/master

some more design changes