changed to support .Net framework 4.0