1.5 update
Merge pull request #1 from davejavu/develop

1.5 update