Merge buddhamagnet/master and resolve merge conflicts