Issue #146 Add features from maestrodev fork

Set as pending those that don't yet pass