bug fixing
Merge pull request #55 from mdjordjevic/bugfixing

bug fixing