This includes the changes from pull #248 And fixes issue #247, by replacing 'defaulx' with 'default_'.