Bug fixing
Merge pull request #51 from mdjordjevic/bugfixing

Bug fixing