Version 2015-25-01: Major update