Resolves issue #9 (check before closing plz)