Added compatibility with stable SM 1.5.0