New and updated design
Merge origin/master