updated based on Jack's comments
Merge remote-tracking branch 'upstream/master'
all of my changes
Merge pull request #56 from ehsteve/master

My updates