closes #9, redesign
0.2.1