Boost-1.55 compatibility

Fix incompatibilities with boost-1.55. Fixes #3