Version 2016-01-16: Major update