refactored, added range adjustments
Merge branch 'master' of https://github.com/davidnunez/hyperconductor