Bumped version to 0.3.18
Merge branch 'release-0.3.18' into develop