Master

To merge with Mike's most updated code, I need to create the pull request right? I'm trying to tidy up and delete all my branches except one.