#99 is in master now, so feel free to merge or rebase.