Pull recent changed from NathanKell's master branch.