Conventions .NET
Merge branch 'RikM-Cphyc' of http://github.com/Evernest/Evernest into RikM-Cphyc