Bug fixing
Merge pull request #50 from mdjordjevic/bugfixing

Bug fixing