Merge branch 'develop' of https://github.com/npbarnes/Powder-Fit into develop