Thanks @peterflynn. Nice suggestion! I'll submit a new pr soon.