update sine_experiment with latest changes from master