API updated to Version 1.2
Merge branch 'API1.2'