getting things working again
Merge branch 'master' of https://github.com/ajcressman/research

getting things working again