boost fixes
ups
Merge pull request #6 from Mikers/dev-0.8.6.1

Dev 0.8.6.1