osc can now be used in place of oscillator
built after osc change
Merge pull request #35 from stuartmemo/oscillator-to-osc

osc can now be used in place of oscillator