detailed, frood, and kyle added
Merge pull request #18 from taylor/master

detailed, frood, and kyle added