Version 0.18.0

Updating to version 0.18.0