Merge pull request #31 from ElectricEasel/dev

Dev
Update from production
Merge from Production