Merge pull request #3 from honestbuildings/bleeding

AL: bleeding -> master
hotfix: useConnection
fixing conflicts