Pull master 0.4.0