Issue #152 and issue #153: command line builds now working again, though issue #153
may still be open...