Further improvements for thread safeness
Tagged version 0.6.8