removed vs2013-warnings, fixed a bug!