Updated with Unity 4.1