Merge pull request #2 from chaimleib/master

Update: Post-GSI meeting