astyle'd
Merge pull request #87 from gtorrent/astyle

astyle'd