Merge with master branch

Derp fix