Bug fixing.
Merge pull request #191 from egofree71/master

Bug fixing.