Merge pull request #1 from darcythomas/Dev

Dev
Merge remote-tracking branch 'origin/master' into Dev