Refactored to L-expression
Make git-shortlog prettier.
Merge branch 'cathive-master' into fxmlComponent