Fixes #49 Thanks @filitchp