Working, more or less.
Fixing indentation.
Doing a little house cleaning.
Merge pull request #7 from tdenkinger/master

Admiral Friendly