Bug correction.
Merge pull request #39 from roroah/master

Bug correction.