Commit fde85249458581393a406b11d46a43f6b0254baa

nijtmans 2019-06-13T16:58:06

@minad 's suggestions