Merge pull request #8 from purplecabbage/prep1.5.0

Prep1.5.0