Some more design fixes
Merge pull request #132 from BNoiZe/master

Some more design fixes