Changed boost lib & minor bugfix