Oops..
Merge pull request #15 from tenjava/redesign

Fix fuckup from earlier