Merged changes with docs
Updated .sln to include all source files