Editing fix from TheOtherNick (Fixes #9)