integration of submissions from @luzfcb and @syst3ml00t