Upgraded boost 1.56
Merged changes