Updated to version 0.8.7