Re-added the create_instance functionality
Merge remote-tracking branch 'origin/master'