Update for vs 2013 and resolution bugfix