bug fixing
Merge pull request #60 from mdjordjevic/bugfixing

bug fixing