Add Support for +k MODE, fixes #2