Updated Design and some small fixes

Pretty much final Release
Merge pull request #80 from broggi/master

Updated Design and some small fixes