937, 939
Merge pull request #384 from patriot1burke/master

937, 939