bugfixing
Merge pull request #36 from mdjordjevic/bugfixing

bugfixing