Add changes suggest by pull request #24