change #1
change #2 local
Merge pull request #24 from david-on-github/David-Dev

David dev