#40 Handling rename issue for VS2013