Bug fixing
Merge pull request #53 from mdjordjevic/bugfixing

Bug fixing