New solution(VS2010) and bug fix