Fixed to build with GCC4.
Style fixes.
Style fixes.
Merge pull request #1 from Barrett17/master

Modifiche a faber