Merge pull request #56 from nfroidure/master

Markup fixes
Merge pull request #57 from nfroidure/master

Markup fixes 2
Merge pull request #58 from nfroidure/master

Markup fixes 3
Updated ChtiJS group