Update to 0.16.1 #3