test
Merge pull request #269 from patriot1burke/master

tests