Merge feature as per issue #2