Merge Activities

Implementation of issue #15