bug fixes
Merge pull request #337 from patriot1burke/master

bug fixes