backport pull requests #96 and #97 to 1.9 branch
backport doc changes from pull requests #98 (Stateful)  and #100 (conributor typo)