Added check for boost.
Merged master branch.