Fixed MSB error
Merge branch 'hotfix/v1.1b'