Finalizing pull request #112