Merge pull request #16 from david-on-github/develop

sdf
Cleaning up after tests.
Merge pull request #17 from david-on-github/David-Dev

David dev