Fixes #62. Thanks @torocatala