Reopen for Pull request #16