Merged pull request #68