updates for second meeting
Merge pull request #170 from frankV/master

updates for second event