0.18c Update

Updated for latest version (dev_0.18c)