Added workaround for bjam library issue
Fixed syntax errors
Moved class definition to header