Fixed bug #95.
Merge remote-tracking branch 'origin/master' into 0.9