Update for October's meeting
Merge pull request #299 from vormwald/master

Update for October's meeting