Bug fixing
Merge pull request #57 from mdjordjevic/bugfixing

Bug fixing