closes #204
Merge pull request #247 from amirmc/redesign

closes #204