Make use of mutex to ensure single instance (more robust and faster)
Merge branch 'release-0.3' into develop