Updated to use version 2.18 of the SDK