Merged pull request #102 to master