Removed bug in singleton implementation of mainstrategy
Merge branch 'master' into ownthread