added isConnected property. closes #15
fixed conflicts