Can now connect with two stores
Merge remote-tracking branch 'origin/master'