No more warnings! Also did some things to fix issue #10 in the last
commit.