trying strongops
Merge pablo's branch
Fix package.json