fixes
Merge remote-tracking branch 'upstream/master'
merge
Merge pull request #489 from patriot1burke/master

fixes