Updated NRefactory to fix issues with generics (#235, #236)