Add Step oscillator
Add missing files
Merge with master