Use the appropriate branch for building.
Merge pull request #140 from noels/redesign

Use the appropriate branch for building.