Add VS14 support and fix bug with XAML and Delimiter features