#5 Minor design fixes
Merge pull request #14 from gege-alina/radu

#5 Minor design fixes