Merge to master

Just messing with the pull request system because I'm a noob.