Merge pull request #1 from anidotnet/master

Complete port to .net 4.0
Merge remote-tracking branch 'upstream/master'