Gh 1168

ready for merge