Merge pull request #2 from carharttjimmy/master

merging dev with Master
Merge pull request #3 from carharttjimmy/Development

Merge pull request #2 from carharttjimmy/master