Updated for 1.5b1 release.
Merge pull request #26 from emanuelschuetze/master

Updated for 1.5b1 release.