Merge pull request #1 from bplastow/firstbranch

second commit