Consolidating pull request #52 bi @mizipzor.