Merge pull request #119 from fix8/master

Master to Dev, 1.3.1
FX-321
Fixed uniform init issue for Windows
Updated to 1.3.1
Merge pull request #120 from fix8/dev

Dev To Master 1.3.1