Merge pull request #5 from mbrichman/john

condense the header
Merge pull request #6 from mbrichman/master

updating this branch