fixes
Merge pull request #386 from patriot1burke/master

fixes