Added VS14 support