Bunch of additions for testing
Merge pull request #9 from paulehoffman/v05

Bunch of additions for testing