Updated to version 0.99.7