Fixed bugs 471, 472, 479. Note that loading this version in an Emacs with an old version loaded might fail.