New design and added examples closes #1