Version bump to 0.3.18
Merge branch 'release0.3.18' into develop