update for 0.9.x and moment updated to 2.8.3