updating from Koalaaaa/kMember

merging :)