25 May 2017 support

29fb4b6-blackwhite