init master
began working on #patch
began working on #patch