Final polish.
Merge pull request #22 from Ravenstine/polish

Final polish.