changes to fix/resolve pull request #33