Merge pull request #1 from Merchello/1.5.0

Update