Merge pull request #39 from mkuklis/master

split listen to setupSync and listen