Merge pull request #7 from vsalvis/master

Logging, a bug fix (guard logic) and a lazy val for performance