Merge pull request #34 from bhewett/Dev

Merge from master (v1.7.18)
Update version to 1.8.0-SNAPSHOT for dev builds.