Fixed threading issues
Merge branch 'master' of github.com:M4730/JCarcassonne