Fixed width, added proper support for CMS6

Fixed width, added proper support for CMS6 & .Net 3.5