discussed updates
Merge pull request #29 from bglassy/master

discussed updates