@cdeil  - Could you assign #61 to me? That way it's easier to keep track these issues.