Updated to version 0.6.16