Merged 1

Merge modification by Greg