Rolled to version 2.0.0.4