more crude stuff.. etc
Merge pull request #24 from Plunkett112358/master

more crude stuff.. etc