Merge with dev

I did this backwards I meant to pull from the dev branch to my machine.