Merge pull request #1 from uic-evl/master

FIX: vs2012