Adding new dev branch JH
cleaning up some merging artifacts