Merge pull request #33 from david-on-github/David-Dev

David dev
Merge pull request #34 from david-on-github/David-Dev

David dev
Merge pull request #35 from david-on-github/David-Dev

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

David dev
Merge pull request #37 from david-on-github/David-Dev

David dev
Merge pull request #38 from david-on-github/David-Dev

Cleaning up files and directories.
Merge pull request #39 from david-on-github/develop

sync