Update for 1.5

1.5 update, removed unused imports
Merge pull request #3 from davejavu/develop

Update for 1.5