Master parse fix

Merge in additions to master and slave