Bug fixing
Merge pull request #44 from ldjagger/master

Bug fixing