updated to include fixed message
better multi-threading logic
reverting
Merge branch 'devel'