merge dev to master

Old name not useful with version tracking