Minimap may cause deadlock with main thread on Linux
Merge pull request #129 from myaut/development

Minimap may cause deadlock with main thread on Linux