Update for this week
Merge pull request #346 from lawinslow/master

Update for this week