bug fixing
Merge pull request #59 from mdjordjevic/bugfixing

bug fixing