Fix a bug #22
Update version number to 0.8.7