Merged pull-request #46.