Updated to latest master version