Updated to version 0.99.8