updated after changes in nrv
Merge pull request #41 from wajam/fx-fix-connection-leak

updated after changes in nrv