Merge pull request #193 from sbillard/master

Doc update
Merge pull request #194 from sbillard/master

daily update
Merge pull request #196 from sbillard/master

11/5/2014
Merge pull request #197 from sbillard/master

11.6.2014
Fix markup
Merge pull request #198 from Quy/markup

Fix markup
Merge remote-tracking branch 'upstream/master'