Better late than never, this closes #2