Fixes: #12 (closed)
(cherry picked from commit 38e964cc)
Co-authored-by: Johnny Jazeix jazeix@gmail.com