BCLR 97
Merge pull request #40 from krauswg/master

Sanity checking