Merge pull request #2 from remyvv/master

Fixed issue with template parts not showing the right parts
Code style + optimisation
Version update 1.4.0