PR 91 by chadbean, also clarified some known issues