- merging patch from angleman