Reformat, and finally close #9
Merge branch 'refs/heads/develop'