Various design improvements
Merge pull request #30 from atengel/master

Various design improvements