Working on vs2013
see #23