Add source code and check Url
Fix CS and format code.
Merged from master