Merge pull request #219 from svost/boost