Updated to version 0.5.8