#5 now supported, closes #5