Pulling in updates

@Joe0 you should make pull requests more often so I don't have to keep pulling them out of your fork, lol.