Merge pull request #14 from Bkahler/master

journals is done