merge patch 6801c44. fixes #55