Fix/upgrade of shouldjs