reformatted
merged pull request #946