Fix build with libboost >= 1.47. Closes #45
Merge pull request #82 from strk/master-boost147

Fix build with libboost >= 1.47. Closes #45
Resolved merge conflict.