Merge pull request #39 from mdjordjevic/bugfixing

Redesign