the latest
Merge pull request #2 from andrewraynal/master

the latest
Styling
Merge github.com:berjoyner/trinity