Skmp/gdtool

Should fix #497