Let's sort the commits appropriately.
Merge pull request #64 from tenjava/redesign

Let's sort the commits appropriately.