Update from Original k9

Just wanted to pull an update so that we wont be too far behind with our fork.