Merged sinusoids.py with master.