fixes #42, #61
mentioned in commit 8ca5b33b
mentioned in commit d807ab97
mentioned in commit f9572e41