Updates from Jon branch
Merge branch 'sprint17' of https://github.com/puruckertom/ubertool_eco into sprint17