Merge pull request #1 from jkru/master

Updates from Julie & Heather