merges #8 from @jelofson