small design changes
Merge origin/master