1.5 update

Updated for 1.5, updated pom.xml
Merge pull request #1 from davejavu/master

Update for 1.5