Merge pull request #1514 from breethomas/master

Redesign