merge pull-request #13