Merge pull request #1 from klunker/Dev

Test
Merge pull request #2 from klunker/Dev

Test
Rename project
Merge origin/master into Dev