[Issue #3]: Merge branch 'multiple_instances' into bleeding