updated slightly, added latest pr