add two proposals from Dustin
Merge remote-tracking branch 'upstream/master'
Merge pull request #303 from gergnz/master

2 Proposals from Dustin