Fix .net framework 4.5
Merge branch 'develop'