Removed elpa
Typo
Added insertion of redundant C++ header guard
Doc
Merge remote-tracking branch 'upstream/master'