Updated to version 0.16