updates
Merge branch 'dev1' of https://github.com/jmmaloney4/voltz into dev1