stuff
Merge pull request #276 from patriot1burke/master

links