fixes
Merge branch 'master' of https://github.com/nonamerkpnu/Asp.net