Updated to latest master revision