No magic numbers
Resampleing tweaks
Resampleing tweaks
Merge branch 'master' of github.com:stephanfowler/ophan-sparks