Updates for Release 1.5.0
Merge pull request #21 from thacher/master

Updates for Release 1.5.0