Commandline warnings

Rebased #38 onto the testing branch.