BUGFIX: Ignore \r in scanner; fixes #9