Merge pull request #2 from jmwhicke/master

Update files... hopefully.