Some class
Merge branch 'master' into Laury