Thanks @Manc. Merged his #246 Fixes #227