Modern design version 0.1
Minor design changes.