Corrections from issue #4
Thanks to Icebox and MiTaxi