Bug fix and added msvscpp files.