Change in code to resolve potential problems with mutexes
Merge branch 'master' of http://github.com/ging/lynckia