Manually merge dpasi314
Merge pull request #75 from tenjava/redesign

Manually merge dpasi314