Add kip16#31

saefstroem wants to merge 2 commits intokaspanet:masterkaspanet/kips:masterfrom

saefstroem:kip16saefstroem/kips:kip16Copy head branch name to clipboard