Merge pull request #22 from duff2013/master

fix for 2 and 4MHz
Fix (at least partially) 2 MHz mode
Merge pull request #4 from PaulStoffregen/master

resync