fixes #15 (and adding some additional comments)