Bug fixing
Merge pull request #190 from egofree71/master

Bug fixing