Version 2017-15-01: Major update