waveaccess optimisation
Merge pull request #1 from waveaccess/master

Optimizations contributed by WaveAccess