Merge branch 'origin/develop'
Finish 1.0
Changed target framework to .NET 4.0
Finish 1.0.1