fix for issue #122
Fixed issue #70
typo fix
Merge remote-tracking branch 'upstream/master' into schriste
small update
Merge pull request #135 from ehsteve/schriste

My Fixes