Merge pull request #40 from mdjordjevic/bugfixing

Redesign