Upgraded to 0.3.4 and version 16