Gh 463

tested locally - ready for merge.