updates, very past due. 6th meeting on 8/2
Merge pull request #191 from frankV/master

merging -> updates, very past due. 6th meeting on 8/2