Merge pull request #43 from mdjordjevic/bugfixing

New design