Fixes #52 Thanks @filitchp