Added extra testing functions.
Merge remote-tracking branch 'origin/master'
Added internationalisation.