merge latest code into test branch

Did it backwards, merged from master to test branch (still trying to figure out github)