Update for boost-1.5

Addresses Issue #30 which has had a long outstanding pull request.