Version 2.1.3 final

Version 2.1.3 final with Setup