Merging changes from official SVN-Repository and fixing for MS Visual Studio Express.