Merge pull request #20 from bochecha/master

Classic frequency and a couple of misc changes