Updated to version 1.8 final