Corrections from issue #6
Thanks to MiTaxi and Icebox :)