fixing premature connection timeout bug
Adding test for Issue #15
Merge branch 'master' into cqlv2