fixes to npm adapter.
Merge branch 'master' of github.com:EugeneN/cafe