Merge pull request #2 from carharttjimmy/master

merging dev with Master