Added more code, cleaned up more tests
Merge branch 'master' of https://github.com/BgRva/Blob1.git