Merge pull request #1 from uic-evl/master

FIX: vs2012
Merge pull request #2 from uic-evl/master

Update from upstream 30/09/14 13:18:00
Merge pull request #119 from ioflowstudios/master

Merge pull request #1 from uic-evl/master