Visual Studio 2014 CTP needed some modifications (as always :( )